From a86da304c47bdea9d510e62d47dce4a06b9aa952 Mon Sep 17 00:00:00 2001
From: Kinbay_Wu <kinbay.ty.wu@fii-foxconn.com>
Date: Fri, 6 Sep 2024 13:52:31 +0800
Subject: [PATCH] [BPM-36584] [MT-1985] Fix Pair new RCU fail when connect with
 Kids RCU

    Issue Description:
        1. Pairing Kids RCU (KR01)
        2. Pairing another RCU (BA01 / BA02 / SA02 / etc)
        3. While paired 2 RCU, attempt to pairing another RCU
        4. Pairing failed after about 20 seconds

    Solution:
        1. Change BOS_KR01 slave latency from 133 to 149.

Signed-off-by: Kinbay_Wu <kinbay.ty.wu@fii-foxconn.com>
---
 bta/gatt/bta_gattc_act.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bta/gatt/bta_gattc_act.cc b/bta/gatt/bta_gattc_act.cc
index 7c06658c02..c05963cc7c 100644
--- a/bta/gatt/bta_gattc_act.cc
+++ b/bta/gatt/bta_gattc_act.cc
@@ -1166,7 +1166,7 @@ static void bta_gattc_conn_cback(tGATT_IF gattc_if, const RawAddress& bdaddr,
               if(strncmp((char*)bdname.name, "BOS_KR01", 8) == 0)
               {
                 LOG_INFO("LL_CONNECTION_UPDATE_IND BOS_KR01");
-                L2CA_UpdateBleConnParams(bdaddr,  8, 8, 133, 1000, 0, 8);
+                L2CA_UpdateBleConnParams(bdaddr,  8, 8, 149, 1000, 0, 8);
               }
               else if(strncmp((char*)bdname.name, "BRM_SA02", 8) == 0)
               {
-- 
2.25.1

diff --git a/bta/gatt/bta_gattc_act.cc b/bta/gatt/bta_gattc_act.cc
index 7c06658c02..c05963cc7c 100644
--- a/bta/gatt/bta_gattc_act.cc
+++ b/bta/gatt/bta_gattc_act.cc
@@ -1166,7 +1166,7 @@ static void bta_gattc_conn_cback(tGATT_IF gattc_if, const RawAddress& bdaddr,
               if(strncmp((char*)bdname.name, "BOS_KR01", 8) == 0)
               {
                 LOG_INFO("LL_CONNECTION_UPDATE_IND BOS_KR01");
-                L2CA_UpdateBleConnParams(bdaddr,  8, 8, 133, 1000, 0, 8);
+                L2CA_UpdateBleConnParams(bdaddr,  8, 8, 149, 1000, 0, 8);
               }
               else if(strncmp((char*)bdname.name, "BRM_SA02", 8) == 0)
               {
diff --git a/stack/btm/btm_inq.cc b/stack/btm/btm_inq.cc
index 07ce727c4a..920405ed3b 100644
--- a/stack/btm/btm_inq.cc
+++ b/stack/btm/btm_inq.cc
@@ -77,7 +77,7 @@ using bluetooth::Uuid;
 
 //Vas River modiied for UEI BLE RCU, 2019/09/27
 //#define BTIF_DM_DEFAULT_INQ_MAX_DURATION 10
-#define BTIF_DM_DEFAULT_INQ_MAX_DURATION 15
+#define BTIF_DM_DEFAULT_INQ_MAX_DURATION 50
 
 
 /******************************************************************************/

project packages/apps/Bluetooth/
diff --git a/src/com/android/bluetooth/gatt/GattService.java b/src/com/android/bluetooth/gatt/GattService.java
index bbb31e6a0..575c1abf4 100644
--- a/src/com/android/bluetooth/gatt/GattService.java
+++ b/src/com/android/bluetooth/gatt/GattService.java
@@ -1377,7 +1377,7 @@ public class GattService extends ProfileService {
                     if (name.indexOf(devName) != -1) {
                         Log.e(TAG, "onClientConnected() connId=" + connId + " send connection update");
                         if (name.contains("BOS_KR01")){
-                            leConnectionUpdate(clientIf, address, 8, 8, 133, 1000, 0, 8, getAttributionSource()); /* 8*1.25 = 10ms, 133, 10s supervision timeout, min_ce 0, max_ce 8 */
+                            leConnectionUpdate(clientIf, address, 8, 8, 149, 1000, 0, 8, getAttributionSource()); /* 8*1.25 = 10ms, 133, 10s supervision timeout, min_ce 0, max_ce 8 */
                             Log.e(TAG, "BOS_KR01");
                         } else if (name.contains("BRM_SA02")){
                             leConnectionUpdate(clientIf, address, 9, 9, 266, 1000, 0, 8, getAttributionSource());

project system/bt/
diff --git a/stack/btm/btm_inq.cc b/stack/btm/btm_inq.cc
index 07ce727c4..48cbd47cd 100644
--- a/stack/btm/btm_inq.cc
+++ b/stack/btm/btm_inq.cc
@@ -77,7 +77,8 @@ using bluetooth::Uuid;
 
 //Vas River modiied for UEI BLE RCU, 2019/09/27
 //#define BTIF_DM_DEFAULT_INQ_MAX_DURATION 10
-#define BTIF_DM_DEFAULT_INQ_MAX_DURATION 15
+//kinbay mantis 1985 
+#define BTIF_DM_DEFAULT_INQ_MAX_DURATION 50
 
 

diff --git a/bta/gatt/bta_gattc_act.cc b/bta/gatt/bta_gattc_act.cc
index 7c06658c02..c05963cc7c 100644
--- a/bta/gatt/bta_gattc_act.cc
+++ b/bta/gatt/bta_gattc_act.cc
@@ -1166,7 +1166,7 @@ static void bta_gattc_conn_cback(tGATT_IF gattc_if, const RawAddress& bdaddr,
               if(strncmp((char*)bdname.name, "BOS_KR01", 8) == 0)
               {
                 LOG_INFO("LL_CONNECTION_UPDATE_IND BOS_KR01");
-                L2CA_UpdateBleConnParams(bdaddr,  8, 8, 133, 1000, 0, 8);
+                L2CA_UpdateBleConnParams(bdaddr,  8, 8, 149, 1000, 0, 8);
               }
               else if(strncmp((char*)bdname.name, "BRM_SA02", 8) == 0)
               {
diff --git a/stack/btm/btm_inq.cc b/stack/btm/btm_inq.cc
index 07ce727c4a..b3195fb193 100644
--- a/stack/btm/btm_inq.cc
+++ b/stack/btm/btm_inq.cc
@@ -76,8 +76,8 @@ using bluetooth::Uuid;
 #endif
 
 //Vas River modiied for UEI BLE RCU, 2019/09/27
-//#define BTIF_DM_DEFAULT_INQ_MAX_DURATION 10
-#define BTIF_DM_DEFAULT_INQ_MAX_DURATION 15
+#define BTIF_DM_DEFAULT_INQ_MAX_DURATION 15
+#define BTIF_DM_DEFAULT_INQ_LENGTH 10
 
 
 /******************************************************************************/
@@ -557,7 +557,7 @@ tBTM_STATUS BTM_StartInquiry(tBTM_INQ_RESULTS_CB* p_results_cb,
       (uint16_t)(BT_DEFAULT_BUFFER_SIZE / sizeof(tINQ_BDADDR));
 
   bluetooth::legacy::hci::GetInterface().StartInquiry(
-      general_inq_lap, p_inq->inqparms.duration, 0);
+      general_inq_lap, BTIF_DM_DEFAULT_INQ_LENGTH, 0);
   return BTM_CMD_STARTED;
 }
 

From c683358a8d47835ceddb6ed891ac85d5fc5ef298 Mon Sep 17 00:00:00 2001
From: Kinbay_Wu <kinbay.ty.wu@fii-foxconn.com>
Date: Thu, 26 Sep 2024 16:41:31 +0800
Subject: [PATCH] [BPM-36584] [MT-1985] Fix Pair new RCU fail when connect with
 Kids RCU and another RCU [2/2]

    Impact projects:
        1. system/bt
        2. vendor/amlogic/common

Signed-off-by: Kinbay_Wu <kinbay.ty.wu@fii-foxconn.com>
---
 wifi_bt/bluetooth/broadcom/btbuild/bdroid_buildcfg.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wifi_bt/bluetooth/broadcom/btbuild/bdroid_buildcfg.h b/wifi_bt/bluetooth/broadcom/btbuild/bdroid_buildcfg.h
index 51f893b8..6e706596 100644
--- a/wifi_bt/bluetooth/broadcom/btbuild/bdroid_buildcfg.h
+++ b/wifi_bt/bluetooth/broadcom/btbuild/bdroid_buildcfg.h
@@ -48,7 +48,7 @@
 #define KERNEL_MISSING_CLOCK_BOOTTIME_ALARM TRUE
 
 //Vas modified for UEI BLE RCU, River 2019/09/23
-#define BTA_DM_PAGE_TIMEOUT 12288  //7.5 sec
+#define BTA_DM_PAGE_TIMEOUT 32000  //20 sec
 
 //Vas modified for UEI BLE RCU A2DP, Kerwin 2020/09/02
 #define BTM_SSR_INCLUDED FALSE //disable sniff subrating
-- 
2.25.1

From bccec79c9f58c76b065b286bc09625b1149c7d8a Mon Sep 17 00:00:00 2001
From: Kinbay_Wu <kinbay.ty.wu@fii-foxconn.com>
Date: Thu, 26 Sep 2024 16:39:25 +0800
Subject: [PATCH] [BPM-36584] [MT-1985] Fix Pair new RCU fail when connect with
 Kids RCU and another RCU [1/2]

    Impact projects:
        1. system/bt
        2. vendor/amlogic/common

Signed-off-by: Kinbay_Wu <kinbay.ty.wu@fii-foxconn.com>
---
 bta/gatt/bta_gattc_act.cc   | 6 ++----
 stack/btm/btm_ble_bgconn.cc | 4 ++--
 stack/btm/btm_inq.cc        | 6 +++---
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/bta/gatt/bta_gattc_act.cc b/bta/gatt/bta_gattc_act.cc
index 7c06658c02..486f9f34f7 100644
--- a/bta/gatt/bta_gattc_act.cc
+++ b/bta/gatt/bta_gattc_act.cc
@@ -1163,19 +1163,17 @@ static void bta_gattc_conn_cback(tGATT_IF gattc_if, const RawAddress& bdaddr,
             if (send_update_ind == false)
             {
               send_update_ind = true;
+              LOG_INFO("LL_CONNECTION_UPDATE_IND %s", (char*)bdname.name);
               if(strncmp((char*)bdname.name, "BOS_KR01", 8) == 0)
               {
-                LOG_INFO("LL_CONNECTION_UPDATE_IND BOS_KR01");
-                L2CA_UpdateBleConnParams(bdaddr,  8, 8, 133, 1000, 0, 8);
+                L2CA_UpdateBleConnParams(bdaddr,  8, 8, 149, 1000, 0, 8);
               }
               else if(strncmp((char*)bdname.name, "BRM_SA02", 8) == 0)
               {
-                LOG_INFO("LL_CONNECTION_UPDATE_IND BRM_SA02");
                 L2CA_UpdateBleConnParams(bdaddr,  9, 9, 266, 1000, 0, 8);
               }
               else 
               {
-                LOG_INFO("LL_CONNECTION_UPDATE_IND %s", (char*)bdname.name);
                 L2CA_UpdateBleConnParams(bdaddr,  9, 9, 133, 1000, 0, 8 );
               }
             }
diff --git a/stack/btm/btm_ble_bgconn.cc b/stack/btm/btm_ble_bgconn.cc
index 2415b46822..7e7e140e4d 100755
--- a/stack/btm/btm_ble_bgconn.cc
+++ b/stack/btm/btm_ble_bgconn.cc
@@ -342,10 +342,10 @@ bool btm_ble_start_auto_conn() {
   ASSERT(p_cb != nullptr);
 
   const uint16_t scan_int = (p_cb->scan_int == BTM_BLE_SCAN_PARAM_UNDEF)
-                                ? BTM_BLE_SCAN_SLOW_INT_1
+                                ? BTM_BLE_SCAN_FAST_INT
                                 : p_cb->scan_int;
   const uint16_t scan_win = (p_cb->scan_win == BTM_BLE_SCAN_PARAM_UNDEF)
-                                ? BTM_BLE_SCAN_SLOW_WIN_1
+                                ? BTM_BLE_SCAN_FAST_WIN
                                 : p_cb->scan_win;
   uint8_t own_addr_type = p_cb->addr_mgnt_cb.own_addr_type;
   uint8_t peer_addr_type = BLE_ADDR_PUBLIC;
diff --git a/stack/btm/btm_inq.cc b/stack/btm/btm_inq.cc
index 07ce727c4a..fde161fe10 100644
--- a/stack/btm/btm_inq.cc
+++ b/stack/btm/btm_inq.cc
@@ -76,8 +76,8 @@ using bluetooth::Uuid;
 #endif
 
 //Vas River modiied for UEI BLE RCU, 2019/09/27
-//#define BTIF_DM_DEFAULT_INQ_MAX_DURATION 10
-#define BTIF_DM_DEFAULT_INQ_MAX_DURATION 15
+#define BTIF_DM_DEFAULT_INQ_MAX_DURATION 20 //system timeout duration (second)
+#define BTIF_DM_DEFAULT_INQ_LENGTH 10 //UCI sent to BT controller x1.28 second 0~48 
 
 
 /******************************************************************************/
@@ -557,7 +557,7 @@ tBTM_STATUS BTM_StartInquiry(tBTM_INQ_RESULTS_CB* p_results_cb,
       (uint16_t)(BT_DEFAULT_BUFFER_SIZE / sizeof(tINQ_BDADDR));
 
   bluetooth::legacy::hci::GetInterface().StartInquiry(
-      general_inq_lap, p_inq->inqparms.duration, 0);
+      general_inq_lap, BTIF_DM_DEFAULT_INQ_LENGTH, 0);
   return BTM_CMD_STARTED;
 }
 
-- 
2.25.1

diff --git a/bta/gatt/bta_gattc_act.cc b/bta/gatt/bta_gattc_act.cc
index 486f9f34f7..035c6017d9 100644
--- a/bta/gatt/bta_gattc_act.cc
+++ b/bta/gatt/bta_gattc_act.cc
@@ -1166,15 +1166,15 @@ static void bta_gattc_conn_cback(tGATT_IF gattc_if, const RawAddress& bdaddr,
               LOG_INFO("LL_CONNECTION_UPDATE_IND %s", (char*)bdname.name);
               if(strncmp((char*)bdname.name, "BOS_KR01", 8) == 0)
               {
-                L2CA_UpdateBleConnParams(bdaddr,  8, 8, 149, 1000, 0, 8);
+                L2CA_UpdateBleConnParams(bdaddr,  24, 24, 149, 1000, 0, 8); /* 8*1.25 = 10ms, 133, 10s supervision timeout, min_ce 0, max_ce 8 */
               }
               else if(strncmp((char*)bdname.name, "BRM_SA02", 8) == 0)
               {
-                L2CA_UpdateBleConnParams(bdaddr,  9, 9, 266, 1000, 0, 8);
+                L2CA_UpdateBleConnParams(bdaddr,  24, 24, 266, 1000, 0, 8);
               }
               else 
               {
-                L2CA_UpdateBleConnParams(bdaddr,  9, 9, 133, 1000, 0, 8 );
+                L2CA_UpdateBleConnParams(bdaddr,  24, 24, 133, 1000, 0, 8);
               }
             }
             else 
diff --git a/stack/include/btm_ble_api_types.h b/stack/include/btm_ble_api_types.h
index fe5a7fb8c2..630fcfeb07 100644
--- a/stack/include/btm_ble_api_types.h
+++ b/stack/include/btm_ble_api_types.h
@@ -121,7 +121,7 @@ typedef uint8_t tBTM_BLE_SFP;
 #define BTM_BLE_SCAN_WIN_MAX 0x4000
 #define BTM_BLE_EXT_SCAN_INT_MAX 0x00FFFFFF
 #define BTM_BLE_EXT_SCAN_WIN_MAX 0xFFFF
-#define BTM_BLE_CONN_INT_MIN 0x0006
+#define BTM_BLE_CONN_INT_MIN 24 //0x0006
 #define BTM_BLE_CONN_INT_MAX 0x0C80
 #define BTM_BLE_CONN_LATENCY_MAX 500
 #define BTM_BLE_CONN_SUP_TOUT_MIN 0x000A
@@ -191,7 +191,7 @@ typedef uint8_t tBTM_BLE_SFP;
 
 /* minimum acceptable connection interval */
 #ifndef BTM_BLE_CONN_INT_MIN_LIMIT
-#define BTM_BLE_CONN_INT_MIN_LIMIT 0x0009
+#define BTM_BLE_CONN_INT_MIN_LIMIT 24 //0x0009
 #endif
 
 /* minimum acceptable connection interval when there is bonded Hearing Aid